//
//  ViewController.m
//  GitText2
//
//  Created by lk on 15/11/17.
//  Copyright © 2015年 liukai. All rights reserved.
//

#import "ViewController.h"

@interface ViewController ()

@end

@implementation ViewController

- (void)viewDidLoad {
    [super viewDidLoad];
<<<<<<< HEAD
    UITextField *text = [[UITextField alloc]initWithFrame:CGRectMake(100, 100, 100, 100)];
    text.text = @"lmj";
    [self.view addSubview:text];
=======
    
    // addView lk
    UIView *aView = [[UIView alloc] initWithFrame:CGRectMake(100, 100, 100, 100)];
    [self.view addSubview:aView];
    aView.backgroundColor = [UIColor redColor];
    aView.backgroundColor = [UIColor greenColor];
    
>>>>>>> 05b8cf014b07fccdf248f71f8078f64c67b05b49
}

- (void)didReceiveMemoryWarning {
    [super didReceiveMemoryWarning];
    // Dispose of any resources that can be recreated.
}

@end
